Skip to content

[CORE] Refactor XferCRC to make it branchless and to remove winsock dependency #1228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

Mauller
Copy link

@Mauller Mauller commented Jul 5, 2025

This PR refactors the XferCRC to make the code branchless and to remove the winsock dependency within it.

There may be minimal performance improvement from this as other factors will need changing in the data being passed to the CRC to further improve the performance.

The winsock dependency has been replaced with the endian compat library instead.

@Mauller Mauller self-assigned this Jul 5, 2025
@Mauller Mauller added Minor Severity: Minor < Major < Critical < Blocker Gen Relates to Generals ZH Relates to Zero Hour Refactor Edits the code with insignificant behavior changes, is never user facing labels Jul 5, 2025
@Caball009
Copy link

Caball009 commented Jul 5, 2025

Perhaps we could go for even fewer branches by using the data size as a template parameter. Most of the call sites use a size that's known at compile-time.

@xezon
Copy link

xezon commented Jul 5, 2025

Replacing the winsock call is good. Removing the hibit branch also makes sense, because the branch predictor likely does not work well there (50% chance). I would like to see a performance comparison when this works without any remaining logical mismatch.

@Mauller Mauller force-pushed the refactor-xfercrc branch from fa239a4 to 9949da4 Compare July 6, 2025 09:14
@Mauller
Copy link
Author

Mauller commented Jul 6, 2025

Fixed the logic on validity handling of the leftover bytes.

@Mauller Mauller force-pushed the refactor-xfercrc branch from 9949da4 to aa01517 Compare July 10, 2025 19:41
@Mauller
Copy link
Author

Mauller commented Jul 10, 2025

rebased with main, just going to make some other tweaks

@Mauller Mauller force-pushed the refactor-xfercrc branch 2 times, most recently from 639521e to 11539cd Compare July 10, 2025 19:53
@Mauller
Copy link
Author

Mauller commented Jul 10, 2025

Tested and tweaked with the switch replacing the second loop, it doesn't mismatch with the golden replays and you would expect it to mismatch pretty quckly if it was going to.

@Caball009
Copy link

Are you seeing any improvements in overall performance?

@Mauller
Copy link
Author

Mauller commented Jul 12, 2025

Are you seeing any improvements in overall performance?

I still need to look into performance testing, need to make a game replay under debug, might just do it with some AI since they can really hit different systems hard.

val = htonl(val);
addCRC (val);
case 3:
val += (c[2] << (2 * 8));

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I overlooked that this would be invalid if data is NULL.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe add fallthrough to these cases?

Copy link
Author

@Mauller Mauller Jul 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if i do switch(leftover * validData) that should then be caught in the default case.

@Mauller Mauller force-pushed the refactor-xfercrc branch from 11539cd to f3c4219 Compare July 12, 2025 17:26
@Mauller
Copy link
Author

Mauller commented Jul 12, 2025

tweaked the switch to catch when data is null, so we don't have valid data.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Gen Relates to Generals Minor Severity: Minor < Major < Critical < Blocker Refactor Edits the code with insignificant behavior changes, is never user facing ZH Relates to Zero Hour
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants